Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 25 Oct 2005 10:24:01 +0000 (11:24 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 25 Oct 2005 10:24:01 +0000 (11:24 +0100)

Trivial merge